Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 9 Dec 2005 11:05:06 +0000 (11:05 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 9 Dec 2005 11:05:06 +0000 (11:05 +0000)

Trivial merge